Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_MAPPED)

Use new API instead: gtk_widget_set_mapped ()

https://bugzilla.gnome.org/show_bug.cgi?id=69872

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index f6feb38ac39abf7114502f23af549b7a2e16c5d2..1e2c3ce43271a36c3b447f197707e9bf7e1e52b2 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1235,7 +1235,7 @@ gtk_assistant_map (GtkWidget *widget)
   GList *page_node;
   GtkAssistantPage *page;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   gtk_widget_map (priv->header_image);
   gtk_widget_map (priv->action_area);
@@ -1271,7 +1271,7 @@ gtk_assistant_unmap (GtkWidget *widget)
   GtkAssistant *assistant = GTK_ASSISTANT (widget);
   GtkAssistantPrivate *priv = assistant->priv;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   gtk_widget_unmap (priv->header_image);
   gtk_widget_unmap (priv->action_area);

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 08216ae2f7af60ce57e862e25acccf2d6a2eaccb..eb37434f722ce8678d1ee3ae2a313a500a78c118 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4618,7 +4618,7 @@ gtk_clist_unrealize (GtkWidget *widget)
   if (gtk_widget_get_mapped (widget))
     gtk_clist_unmap (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   /* detach optional row/cell styles */
   if (gtk_widget_get_realized (widget))
@@ -4686,7 +4686,7 @@ gtk_clist_map (GtkWidget *widget)
 
   if (!gtk_widget_get_mapped (widget))
     {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, TRUE);
 
       /* map column buttons */
       for (i = 0; i < clist->columns; i++)
@@ -4725,7 +4725,7 @@ gtk_clist_unmap (GtkWidget *widget)
 
   if (gtk_widget_get_mapped (widget))
     {
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, FALSE);
 
       if (clist_has_grab (clist))
        {

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index c7f429de6d5e607afbb9eb69f0c0fcaeff028a2e..6bedc86e990b0e151cfc808af98550c0193af01c 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2665,7 +2665,7 @@ gtk_container_map_child (GtkWidget *child,
 static void
 gtk_container_map (GtkWidget *widget)
 {
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   gtk_container_forall (GTK_CONTAINER (widget),
                        gtk_container_map_child,
@@ -2678,7 +2678,7 @@ gtk_container_map (GtkWidget *widget)
 static void
 gtk_container_unmap (GtkWidget *widget)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   if (gtk_widget_get_has_window (widget))
     gdk_window_hide (widget->window);

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index b3e12d3124b5b07bc4e4224ad5104fcbec0d2a18..25d61aa172331a995ca8b75e3bbd78149ec5f074 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -348,7 +348,7 @@ gtk_handle_box_map (GtkWidget *widget)
   GtkBin *bin;
   GtkHandleBox *hb;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   bin = GTK_BIN (widget);
   hb = GTK_HANDLE_BOX (widget);
@@ -373,7 +373,7 @@ gtk_handle_box_unmap (GtkWidget *widget)
 {
   GtkHandleBox *hb;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   hb = GTK_HANDLE_BOX (widget);
 

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index be7917bd37596c3af22efb42937ff77995e1cd41..7e3e0b9afbc270ffd56d3220d3674f3390e13fab 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -908,7 +908,7 @@ gtk_layout_map (GtkWidget *widget)
   GtkLayout *layout = GTK_LAYOUT (widget);
   GList *tmp_list;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   tmp_list = layout->children;
   while (tmp_list)

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 29a0c637d9ca3079063050576113632d8d52bb59..b792e487cccf4da49b71bae23b413f2efe100021 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -490,7 +490,7 @@ gtk_list_unmap (GtkWidget *widget)
   if (!gtk_widget_get_mapped (widget))
     return;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   if (list_has_grab (list))
     {

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index a8e99db244ce4927deb267c81d9d4f0e04ff5300..aa422686e3d516d1b54377940f3cb3e6700dcf97 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1736,7 +1736,7 @@ gtk_notebook_map (GtkWidget *widget)
   GList *children;
   gint i;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   notebook = GTK_NOTEBOOK (widget);
   priv = GTK_NOTEBOOK_GET_PRIVATE (notebook);
@@ -1782,7 +1782,7 @@ gtk_notebook_unmap (GtkWidget *widget)
 {
   stop_scrolling (GTK_NOTEBOOK (widget));
   
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   gdk_window_hide (GTK_NOTEBOOK (widget)->event_window);
 

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 8de5b2f0973a3a372f61998603b7bdde85a0c22d..52d2b925f9582ddcbf2fda10c1e275be10017e50 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -708,7 +708,7 @@ gtk_plug_map (GtkWidget *widget)
       GtkBin *bin = GTK_BIN (widget);
       GtkPlug *plug = GTK_PLUG (widget);
       
-      GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, TRUE);
 
       if (bin->child &&
          gtk_widget_get_visible (bin->child) &&
@@ -732,7 +732,7 @@ gtk_plug_unmap (GtkWidget *widget)
     {
       GtkPlug *plug = GTK_PLUG (widget);
 
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, FALSE);
 
       gdk_window_hide (widget->window);
 

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 1ac137a98b3c9e66ec3862f459c2e0bd514028a1..7d842c13785952dadcdca5f0dc4afed00ebc1e5d 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -513,7 +513,7 @@ gtk_tree_map (GtkWidget *widget)
   GtkWidget *child;
   GList *children;
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
   
   children = tree->children;
   while (children)
@@ -948,7 +948,7 @@ gtk_tree_unmap (GtkWidget *widget)
   
   g_return_if_fail (GTK_IS_TREE (widget));
   
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
   gdk_window_hide (widget->window);
   
 }

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index e86cbfa615013048909c5a54a8f09e63eaf39fcc..8ea6c5c92e7135d04b14292e951be272321555a5 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -943,7 +943,7 @@ gtk_tree_item_map (GtkWidget *widget)
   GtkBin *bin = GTK_BIN (widget);
   GtkTreeItem* item = GTK_TREE_ITEM(widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   if(item->pixmaps_box &&
      gtk_widget_get_visible (item->pixmaps_box) &&
@@ -964,7 +964,7 @@ gtk_tree_item_unmap (GtkWidget *widget)
   GtkBin *bin = GTK_BIN (widget);
   GtkTreeItem* item = GTK_TREE_ITEM(widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   gdk_window_hide (widget->window);
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f11f6f21a87e1badb60ef14de3990aa8e20e1f73..0053d95899f8ebaba7f8f01a92d901926b794eb9 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1738,7 +1738,7 @@ gtk_tree_view_map (GtkWidget *widget)
   GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
   GList *tmp_list;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   tmp_list = tree_view->priv->children;
   while (tmp_list)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 275f06e3412d2951371260570c51f682d08ecd57..b7b0b5edc64b6cf06db6232b4d715f8a3517e63f 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3551,7 +3551,8 @@ gtk_widget_unrealize (GtkWidget *widget)
       g_object_ref (widget);
       _gtk_tooltip_hide (widget);
       g_signal_emit (widget, widget_signals[UNREALIZE], 0);
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED | GTK_MAPPED);
+      gtk_widget_set_realized (widget, FALSE);
+      gtk_widget_set_mapped (widget, FALSE);
       g_object_unref (widget);
     }
 }
@@ -6031,9 +6032,9 @@ gtk_widget_set_mapped (GtkWidget *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (mapped)
-    GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+    GTK_OBJECT_FLAGS (widget) |= GTK_MAPPED;
   else
-    GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+    GTK_OBJECT_FLAGS (widget) &= ~(GTK_MAPPED);
 }
 
 /**
@@ -8753,7 +8754,7 @@ gtk_widget_real_map (GtkWidget *widget)
   
   if (!gtk_widget_get_mapped (widget))
     {
-      GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, TRUE);
       
       if (gtk_widget_get_has_window (widget))
        gdk_window_show (widget->window);
@@ -8773,7 +8774,7 @@ gtk_widget_real_unmap (GtkWidget *widget)
 {
   if (gtk_widget_get_mapped (widget))
     {
-      GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+      gtk_widget_set_mapped (widget, FALSE);
 
       if (gtk_widget_get_has_window (widget))
        gdk_window_hide (widget->window);
@@ -8816,7 +8817,7 @@ gtk_widget_real_unrealize (GtkWidget *widget)
   if (gtk_widget_get_mapped (widget))
     gtk_widget_real_unmap (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
 
   /* printf ("unrealizing %s\n", g_type_name (G_TYPE_FROM_INSTANCE (widget)));
    */

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index e710a8bfe25c1aeccca7f0bd08053ba7be41a40a..2e1a6b1b64f0a904a49227d7789e0d393a4b0f63 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -267,7 +267,7 @@ gtk_win32_embed_widget_map (GtkWidget *widget)
 {
   GtkBin *bin = GTK_BIN (widget);
   
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
   
   if (bin->child &&
       gtk_widget_get_visible (bin->child) &&
@@ -280,7 +280,7 @@ gtk_win32_embed_widget_map (GtkWidget *widget)
 static void
 gtk_win32_embed_widget_unmap (GtkWidget *widget)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
   gdk_window_hide (widget->window);
 }
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 577f672c55d8c69d6d16b1eed4d40dd8be9d6438..778c47110bb314b90aae6fb3a3c764bc91cc4cd3 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4567,7 +4567,7 @@ gtk_window_map (GtkWidget *widget)
   GdkWindow *toplevel;
   gboolean auto_mnemonics;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, TRUE);
 
   if (window->bin.child &&
       gtk_widget_get_visible (window->bin.child) &&
@@ -4677,7 +4677,7 @@ gtk_window_unmap (GtkWidget *widget)
   GtkWindowGeometryInfo *info;    
   GdkWindowState state;
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+  gtk_widget_set_mapped (widget, FALSE);
   if (window->frame)
     gdk_window_withdraw (window->frame);
   else